add pairs and clean commented out code