add descriptor class
adjust spacing