refactor command layout and syntax