Simple re-factor and complete Project.