clean up, class structructure