Major cleanup of project for code review.