better phone responsiveness, code refactoring