Rewrite definition/declaration of variables to be more compact