Cosmetic changes + add some examples