More Citation formatter refactoring