Refactoring is almost done!