The form views comment block bothered me... Cleaning it up