Finished my part of refactoring.