Reorganized header.
Original code from textbook (combined two classes into 1 for brevity).