fix controller escape key detection
refactor
fix terrible 3-space tabs
refactoring