Change readme and comments