better comments and small startup of structure change