Fixed Code review comments