updates based on PR feedback