Coding conventions
Removing debug code
Adding the UserShell