REFACTOR

Assignment 1