Refactor #3 Complete