Cleanup and minor (very minor) SpongeAPI implementation