Added code comments + improved readability