Refactor and add unit test