Better commenting for the code