Eliminate magic number