removed MVP pattern