Code cleanup

Can you do this too much?