Improved commenting
Documentation