Organizing the code
Improving the timer