style + review fixes