Tidyup

Removed whitespace etc