quick and dirty code review with minor changes

I agree!