clean up code. smarter update strategy
v 0.0.2