General cleanup and update