improve formating to fix checkstyle bugs
Fixes #59
Fixes #60
formated java files to fix checkstyle issues