Moves markup functions into lib/markup.js