Issue #17: Refactor the static configuration class

Also follows up on the not completed changes states in the last commit.