Implement more clean functions for stricter parser.
Fix markup.