refactoring, made exercise form into a partial