Invoice Page 2 refactoring