(TK-2) cleanup based on PR feedback