Added some private constants, no magic numbers now
Added some private constants, no magic numbers now