clean for refactoring
init with new structures