Small refactoring, cleaning (still missing some javadocs :))
Merge pull request #3 from sebfz1/master

Small refactoring, reformating & cleaning