#2: Apply code review comments from Kelleman