Cleaned up RPC

Cleaned up the RPC methods