nitpicking, otherwise great rewrite thx xtrv