code refactoring + ressource file changed