Code cleanup

Just a few minor tweaks.