Added code review improvements