Adds comments, changes the two printHeaders to private
Removes a to-do as it's done