Finish Refactor