Clean up

refactored Concorance a little to make it make more sense