refactor

clean and prepare for touch