Clean up, thanks IntelliJ