Yup, code clean up.

Aw, come on!