Update dependancies
Fix style and add comments