magic number clean up