cleaning up a bit, need to tweak tests next