Cleaning, formatting, and sorting code.
Fixing test cases.