Updated indentation to 2 spaces.
Added some braces.
Small refactor to better track touches.