Rearranged sprites, removed useless pseudo-optimisations