Clean up code.

This is just generic cleaning.