Improving Software Remodularisation