the final changes that i forgot to submit :-/, code review cleanup