Tidying
Working on style stuff
Fixed
Fixed merge