Refactor + add tests