cleaning up my mess