Modify readme and comments