Code refactoring

It's a mistake I'll fix it :)