Code refactoring
Code refactoring
Revert of last dummy commit and minor code refactoring
Revert of last dummy commit and minor code refactoring
I am trigger happy on my up history key (another revert of dummy commit)
Further refactoring