removed unused property, comments fixes