edits based on Andres' code review