kyledrake fix boolean return, dry up code a bit

Latest commit bf590ea

Nov 12, 2012