Just some minor changes
Removed some irrelevant comments