Small refactoring
Light changes