refactoring
ready to AI