Refactored code, preparing for new assets and input