Style: Addressed some comments