Tidy up

Tided up both files to make easier to read