further style related fixes