a bit more refactor and import fix