Refactoring for clarity
Refactored and changed a file name because of ambiguity. Added simple timings for some functions to avoid checking again and again.