Simplify

@shaohua