Refactor using l()