Refactroring, went green with all tests