comment, and cleanup of unused var