post code review fixes