Did full project cleanup, got formatting brought up to current
standards.