Some refactoring

Some refactoring