Some refactoring, consolidation of path variables.