Streamlined config, use one commenting style