Updated code to match new command-line interaction as well as reduced tabs to 4 characters.