more clean up, beter media