fix&cleanup