Few more style cleanups