Refactor Soil Sample building