Some cleanup and preparation for neatly displaying everything