Formatted with go fmt
Cleanup, additional log messages