Tidy up codes
Update README