commits and clean up