Code maintenance style

Code cleanup to allow C++11 improved error checking with overloaded functions.