[Console] applied comments from github