Multiple style cleanups etc