Adjustments as per rschroll's code review