aaccounting for all of the code review comments, including sanitizing input, stylistic changes, a few other things.