Tidy and standardize comments