Added comments and removed escaping