A little bit of refactoring, testing out intellij