some code styling cleanups

mostly lines too long