Finish command gen