Readme update, code clean up