continued refactoring

finished handling the android control logic