Code review fixes
Code review fixes
Removing empty lines