README update and code clean up.