Tidy up of Opposition app