Comments and cleanup String_Constant