all tests passing
removed constants