Moved constants to a more idiomatic place