INVOICING : rewriting, improve code