Cleaned up the code.

Cleaned up the code.
Added static function for creating simple tags.