Make comments an optional feature