change CamelCase to -
Added and address most of patch-1 yry comments