Finished with the refactoring project.