Cosmetics and small fix

☺