refactor data stops
Revert "Updated at 2014-11-21 10:50:15 -0800."

This reverts commit b9b046dfc6f41752ffe4847118e58750fa7912bd.
refactor data times