#2 - Refactoring for MCV model with Javascript