clean up Configuration implementation
Merge pull request #3 from chaslemley/clean_up_configuration

clean up Configuration implementation