More consistent code style