[CB] -- Refactored Composite+Team matchers in Java
tidied up code formatting slightly