refactor variable names
refactor deck view