Switched to IntelliJ and carried out complete code reformat.