Did some more clean up to bring more consistency to project conventions.