Slightly fixed refactoring
Slightly fixed refactoring

AndreyTepaykin/Platform,Qbix/Platform,EGreg/Platform,AndreyTepaykin/Platform,EGreg/Platform,EGreg/Platform,AndreyTepaykin/Platform,AndreyTepaykin/Platform,Qbix/Platform,Qbix/Platform,EGreg/Platform,Qbix/Platform