fixing Mac implmentation w/ code review requested changes