-Remove some magic numbers
-more clean up