Refactoring

One more