Minor code changes from review with CoreyC.