Make our code more modular