minor changes / cleaning