further style enhancements

further style enhancements