Added some comments and cleaned up some magic numbers