small cleanups
style changes