MNT: Refactor constants (comments welcome)

closes #209 
not sure it's worth doing, but you seem to be insistent, so go ahead and do it