removed unused constant
refactored source retrieval into it's own class