After code reviews changes