Formatting
Removed unused properties
Moving stuff around and added some blank lines to improve readability
Added bunch of metadata to pom.xml