Still code clean up.

Crazy, right?