your first point is totally valid - will fix.  but yeah, let's pick a style guide and refactor at some point.