Done cleaning, and reviewed. #12