Wrap method class and method_call to its own objects, seems like code is...

... getting better