Remove duplicate code from refactor and new line at end of each file
Merge pull request #33 from pjc/fix

Remove duplicate code from refactor and new line at end of each file