Minor code formatting. Handle uninitialized variables.