Minor cleanup & re-sharper stuff.