More constants, shorter code