Clean up

Removing some comments and fixing a iOS bug with refresh.