moved to intellij and refactor