Cleaned up configuration.h