How to prepare for April’s tax changes