Cleaning up my use of magic numbers