Code is slightly more modular