Minor cosmetic cleanups to imports etcPlease seehttps://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/pull-requests/389/overview