Improved standards adherence, tidied up whitespace etc.