minor change and code clean up