Added some way of refactoring