Fixed code style and conventions.