cleaned up syntax for handling custom tag definitions