small internal reorganization
code cleanup to remove these annoying compile warnings in Xcode 4.6