Code review fixes & clarifications