further cleanup of missing rebase styling, addressing styling PR comments and feedback