Fixing typo's and removing if per comment on PR.

Working on unit tests next