Cleaned up some variable initialization [tracker #1700]