Moved constants to their right place.