Go fmt + cleanups