Fixed the compile problem, cleaned up Invoice code of Xero