remove uneeded calls to touch
use === instead of ==
fixing style issues