@trivial changes as per review comments