a little refactoring
Latest With refactored View Controller