Tidy up Invoice class.