A lot of code cleanup
gofmt