Final Commit, cleaned up code