Work on help formatting and moving code to structures that are
responsible for the data