Some clean ups