Cleanup and ReadMe update.