Improved comments & documentation