Cleaned up comments-form a bit #7