Refactory let it best practice