Improved readability and removed unused variable. Removed unused initialized value.