Refactoring, functionallity isn't added
Refactoring