Refactoring

Tedium