Code review + more tests.