clean up code, fix bug with users and message commands