Address review comments for #24