Various fixes

Fixes include removing unused imports, refactoring file names and variable names and consistency fixes.
When you renamed this variable, did you intentionally not change any of the `timer`s below it?