magic number fix and reformat