Cleanups

Just a few pro-tips.