Sonar Cleanup

Using eclipse to refactor methods and static strings into more manageable pieces of logic.