A few of the changes suggested by the code review implemented.