refactoring and some little updates