Keep cleaning the code and making it more modular.