Readme update and cleanup