Code cleanup and who cares about ocelots?!