Cleaned it up a bit. I think it's EOL for this version tho.