Final Commit, refactor