minor adaptation to comments