style cleanup, fixes