Correct comments and some code nice ups