Test cases are all satisfied, time to change some things.