MNT: Refactored scalar data into MVC