Improvements

* Smaller footprint
* Smaller size
* Faster development