finetuning environment placement and cleaned up