Slight refactoring #PLY-59