Refactoring: use Intellij to optimize imports and change public variables to private