minor style improvements
use cli params, minor cleanup