minor naming and log cleanup