some minor style clean ups