Fixing up my mess