cleanup
getting closer to -00 shape