Updating build tools
Refactoring, Cleaning and Optimizing