some attribute reorganisation
some cosmetics
shorter