Remove cruft from init, play with report formatting