Cleaning things up and making them more modular for ease of use for future users.