organize and add constants