Refactoring big methods

Use eclipse to refactor out big methods resolving some sonar issues.
Extract Constants

Extract constants so objects don't keep getting created plus this fixes
sonar issues related to duplicate string usage.
Merge pull request #46 from hazendaz/master

Sonar Cleanup