Clean up messiness