Eliminate magic numbers