Add comments, remove extra white space