[Console] applied advices from github comments