Fix style issues

based on comments from @fatbusinessman