consistent declaration structure, no actual logic changes

ref #30