Cleaned up timing code
added line ending normalization (for git)