Structures now compliant with formatting decisions made yesterday in class. (Hopefully)