Changed formating via gofmt and solved some golint problems.