Refactor motherfucker