A few clean ups