Code cleanup
Cosmetic