Refactored sprite. Resolved #1