Add many many comments + clean up