PER-10: Addressed PR feedback