Bugfix in normalize_unicode and various style fixes
Style fixes
indentation fixes