Fix file to become modular