more consistent code