More formatter work
More formatter work
Removed unnecessary tests and further formatt using defaul settings for gofmt