Beginning IntelliJ refactor.