Refactor everything!