sorry for more nits: this is probably over 80 chars.

feel free to merge after!