Magic number removal
More magic number removal