Good-old fashioned commenting & general tidying

Deleted some unnecessary stuff