Adding header and cleaning up console log messages