More pretty code