Some refactoring
Applied another portion of refactoring