(fix) adapt code to reviews