An improved analysis framework for axion dark matter searches — arXiv2