small refactoring of free-response section and general line broom up