Merge "Refactoring a bunch of code." into jb-ub-mail