Law of Demeter, stupid! Also changes to structure.