Redesigning constants object.
Removing commented out code.
Merge branch 'modularisation' into gh-pages

* modularisation:
  Removing commented out code.
  Redesigning constants object.