Cleanup a little..