Formatted and addressed some additional code review comments.