Updated code to reflect changes in the newspaper solution pack.

Also now following coder standers.