Implement improved variable declaration and initialization