Improve comments and README