Some cleanup (Not really that much.)