Refactoring

It worked on my machine :)