Cleanup + first unit test