PR's comments adressed

Remove pragma header

Remove extra line

PR'S comments adressed

Fix CS

PR's comments adressed