Improve configuration

Suggested by @yodaddyp