one-node configuration

code clean-up