minor formatting
Additional formatting fixes and cleanup
Ran through gofmt formatting
Travis CI test