Fixes
Style changes