cleanup/reformatting from intellij