Trimming some things down and re styling comments