cleaned up constant creation