Adressed neutron's comments

Add extra line

Fix issue

Optimization

Adress comments