Clean + add unit test