cleanup code and bump version