Just some code cleanup/minor tweaks.