Separated organization from display methods