Fill in and clean up