move constants to methods