Apply Sarina's code review suggestions