Making some refactor changes, all tests green local