Finished maxquant refactoring