Cleanup. Cosmetic changes