changes/fixes for style issues
Style changes