CF4, CF5 Fix- Fixes minor sapcing issues. Refactors code.
https://vinsol.atlassian.net/browse/CF-4
https://vinsol.atlassian.net/browse/CF-5