[Dist/Docs] Updating docs and writing cleaner code