cleaned up users code