code cleanup, config vars rename