Revise readme and comments