rearranged config to be cleaner