Refactoring old shit.