cleanup
refactored views to use Scanner