Code comments tidy