Minor comment cleanup
Refactored path checking into a macro
Changed wording on cleaning up channel logging