config.h refactor