Some small changes / updates. IntelliJ is awesome

Signed-off-by: Ollie <dzineit@live.co.uk>