0005. Some Refactoring too.