Resolved code review issues