Minor refactoring - thx Ivandrofly :)