* small code cleanup, use a wrapper for the commands * Better decorator naming * update the error information