Refactor Round 1