Just clean a little better