Stylistic cleanup (i.e. golint)