Just some clean up and adding of comments