Style cleanup
Remove the ICollection interface for now