Tiny code adjustments from inspection