Just a nitpick, but indentation ? It looks off in a bunch of places in that file...