Did some code/comment cleaning.