Mainly gofmt. Don't think i changed anything else.
Removed redundant code. Modified soap.