Post-QuarkMatter code rewrite/cleaning