making changes per review comments