MNT: Refactor constants (comments welcome)

closes #209 
done