camelCase, cleaned up some OO errors, first round of Mike's code review