Updated some comments
Some cleanup