Clean up
Cosmetic