Add more comments in the code