Remove module check
Simplify command building
Simplify
Update style
Update style
Update style
Cleanup