Readability changes

Deletions of minor amounts of unneeded code/comments