all green - start refactor