Removal of magic number