Initial code review

Reviewed by Alex A. - found two dashes replaced by long one