Smartened up some method names and removed some testing code.