some code review

greetings to aaron - let's discuss my changes tomorrow