Removed unused imports, use aliases in drawScreen
Ran HLint and changed suggestions
Added most of the remaining logic instructions