Refactoring here and there.