Cleaning up some checkstyle issues.
Merge pull request #19 from SERG-Delft/checkstyle

Cleaning up some checkstyle issues.