Style changes (following golint)