Fixing up mess