normalize code preparing for loader changes