removed what could have been done differently