Fixing style changes and unicode characters