Misc
Cleaning
Simplified pair-based instances, see #70