Cleanup from InteliJ IDEA