Fixed uninitialized value error.
Code cleanup.