Code tidyup - improved names of objects and small todo items.
Added MethodInterfaceMatcher to match all methods defined in an interface.