Prettyfied some more