more magic number removal