fix axfr in metadata handling and code cleanup
whitespace