Great refactor before the end.