Improve constants