There Are No Tests

Refactoring