Added a configuration handler and modified some static variables to be
more easily read and understood