0004. Some Refactoring.