Some tidy up to user controller