Added fastclick and clean up code