Did a little bit of tidying comments and stripping trailing spaces/replacing tabs with spaces