Removed old code from bbcode
Revised arguments to be more flexible