change usage func, minor style changes