Address lmandel's review comments