tidy and comments