Cleanup a bit
Cleanup a bit