Clean and compare

/cc @bhuga @rick