File commenting and cleanup