PullRequest: First wave of refactorign