Form 1040 to be shorter but with more schedules