Cleaning up and preparing for paper invoice