Refactoring
God dammit