Cleanup and updates README