refactor
last fixes