style fixes and other clean up stuff