Refactor list
Move setters into private (no longer used by list)