Addressed formatting and testcase from code review.