Minor changes according to discussion with Simon
Minor changes
Removed tabs
Renamed methods