Code Refactor Complete