incorporated model refactor into View layer