Refactoring

Because why not