#89 refactoring State: refactoring import list