Improve the comments and README