Added constants, removed magic