Switched to IntelliJ and reformated the whole project