Eliminate magic number
Split off debug info