Style tweaks and adjustments per code review