Address more issues
Go fmted