Method interface clean up

https://github.com/kfgodel/diamond/issues/58