Tidying up with some changes V2

Just made a few slight changes to the previous changes.