Fixing comments addressed by Thad
Fixing issues with passive/active voice