few clean ups