more refactoring
finished invoice extensions