fix accordance with comments