Redesigning constants object.
Removing commented out code.
Merge branch 'modularisation'

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