Style tweaks and changes for code review feedback