Cleanup comments, formatting, etc

Remapped by Srg2Source from Bukkit/CraftBukkit@d9f4d57cd660bfde7d828a377df5d6387df40229