Cleaning up
Fix minification issues
Adjust line breaks