Initial refacotr commit.