simplify code a little
1.0.2