shell codestyle and interactive mode fixes