1.grep fix
2. style