Major code cleanups on spriteset modules