move consts out to common; clarify comments