little bit of cleanup
fixes the last two tests