made changes suggested by @briancavalier and removed a line of test code that was erroneously checked in at some point.