75% of code modularised