Cleanup the hardcoded numbers