General cleaning. Removed unused imports, fixed brackets...
Merge branch 'master' of github.com:melj/part4