litle refactoring
litle fixes