reviewing and revising constants and globals, in progress