Just some OCD changes, formatting, tidying up
Just some OCD changes, formatting, tidying up 2