refactoring

Hi, Alex, try my changes for your code, please!