MNT: Refactor constants (comments welcome)

closes #209 
Fair enough.  Given my sieve like memory and all the re-factoring I lost track of what was new code vs moved code.