Replaced constants, fixed copyright