Updated so that constants were in all caps