Adding a few comments for future improvements