Started work on standardizing constant variables and their locations