fixed basic code review items from James