refactoring on yepnope loading