cleaning up stuff around here