clean up models based on abi's suggestions
clean up views based on abi's suggestions