a few clean ups