Cleanup?

Not sure you guys consider it a cleanup, but it is for me.