Address review comments - thanks @lekha