Cleaned up Configuration and Initializers