unified constants a bit more