Cleaned up warnings generated by IntelliJ