Improve constants file