Clean up variable initialization