cleanup
+ semicolons
- trailing whitespaces