Clean up the internal settings/Constants

[koudis]

The internal setting and constants are not in good shape.

There are multiple approaches - look at COnstants.hpp.

There a unnamed constants as part of the code - remove it!