#18 cleaned comments