removed 2 macros. - One is replaced by the underlying code - The second one ise replaced by a template function removed tabulation used as indentation used getWritable instead of a const_cast used for( val : cont) loop removed useless getId function