Implemented review comments from Kunal