Minor code clean up tweaks