cleaner comments and fixed blank tag marking issue