Use magic number
Fix coding standard