Fixing formatting, parameterising literals as class or module vars, clea...

...ning up unused imports