More helpers
Fix -c flag
Inject helpers into the app
80 chars per line and refactored