#184 Review PR changes