Improved comments in the code