v1.0.0, improve code