refactor and values finetuning