Removed left over TODO comment that had already been fixed.
Added constants for some magical numbers.