refactor: Rearrange methods, fix typos, remove old TODO
remove non-java entries from gitignore