Optimise imports

No functional changes
Idiomatic Scala file naming

No functional changes
Remove extra newlines

No functional changes
Idiomatic Scala parenthesis using

And remove extra {}s
No functional changes
Simplify

No functional changes
Explicit return types are nice (?)

For both reader and compiler

No functional changes