Yeah, this was already how it was though -- I just moved the code from another file.  Going to leave it as I don't fee strongly about it.