Cleanup and update of README