Removed some magic number and warning.