Address review comments from @puls