Abstracted out a magic number and removed some testing code.