Refactoring & Comments. Next: Input manager