refactoring. Still all green
Everything green!