Code Cleanup, mobile optimization