Cleaned up the Factory a little.
Minor fix on Markup.php.