Done refactoring, I hope.
Done refactoring, I hope.