Removed some commented code and replaced some magic numbers