Review code

Not a full test suite