Tidied whitespace, indentation and some formatting
Removed comments from Werner Avenant to tidy up code