Adding comments and @todo for future improvements