Refactored View controller classes