lotsa style fixes/cleanup