More clean syntax. Cosmetic changes