Refactoring initial commit.