Cleaned up for Distribution

Refactored, cleaned up usings, moved fetchexpression string to static
class.