Refactoring Code under Test Protection

Last test is green with previous commits, we can now refactor