DEV: Apply MVP pattern: Fix