Comments, comments everywhere!!! :D

Also some code cleanup