refactored all sprite usages