Refactor, allocation, mobile optimization