better spacing of defs and classes