cleaning up here and there