Cleaning up, correcting mistakes