Renaming of variables
Added logging and refactoring timings