Making the code more modular etc.