Readability updates, unifying some magic numbers as constants