Using map instead of model for touch model. Reformating code.