Move declaration closer to where it is used