= code style improvements