Improve readability and set async config option