code ordened, config file added