Clean up
Add IntelliJ code style