Made code more Consistent with MVP ideal

-