Cleanup api. Do not overlaod + and ++.