Simplify the code/API and update the project files