cosmetics, move declaration where it is used, remove now useless block