Fixed as per code review suggestions.