some magic number removals