refactor conversations_controller a bit