Cleans up methods in Invoice