Well, i didnt mean to fork it.  But hey, i cleaned up a little code.