style fixes
clean up
clan up