Added some string constness