Refactor

Learning