changed comments and refactor the string constants