Minor clean-up of declarations/ initialisation