#411 [Hugo,Andrew] refactored cleaning answer sub types