Merge "Refactor the code base a bit"