cleane up listing and user controller