finish modularising