use sprite type enums instead of integers, remove unneeded variables