Clean up code.
Minor improvements.