Update comments. Remove whitespace