MNT: Refactor constants (comments welcome)

closes #209 
I'll add this as an issue to be tackled later