Code style fixes, internationalization and consistency updates