Prettyfied some classes