Renamed add/remove and changed formatting

Removed  a line here or there, and renamed newUser to addUser, and rmUser to removeUser.