Bjorn
refactor some code #cardmapr