moved to intellij and cleaned up