Refactor list cell