Clean up ResultItem.
Merge branch '#151/clean-up-result-item' into develop