More consistent code