Refactor Part II