Removed pointless test code
Removed confusing comment
Fixed up more comments