Use modules
Use modern syntax