Redoing RPC
Much needed gofmt

.. Need a commit hook :)