A few clean up tweaks