code clean up for the users section