Apply comments of lslezak