Made changes for the reported issues