Clean up code here and there.