Undid some refactoring and removed the Configuration interface.
Slightly renamed a constant.
Refactoring.