Tidy the MVP codebase